Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable promlint in metrics tests #92071

Merged
merged 2 commits into from Jun 19, 2020
Merged

Enable promlint in metrics tests #92071

merged 2 commits into from Jun 19, 2020

Conversation

RainbowMango
Copy link
Member

What type of PR is this?
/kind feature

What this PR does / why we need it:
Enable lint check by default in unit tests.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

/priority important-soon
/assign @logicalhan

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/feature Categorizes issue or PR as related to a new feature. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 12, 2020
@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 12, 2020
@RainbowMango RainbowMango force-pushed the pr_force_promlint_in_testutils branch from 9f3355c to 0ee146e Compare June 13, 2020 01:51
@RainbowMango
Copy link
Member Author

/test pull-kubernetes-node-e2e

SergeyKanzhelev
SergeyKanzhelev reviewed Jun 16, 2020
View reviewed changes
staging/src/k8s.io/component-base/metrics/testutil/promlint.go
return nil
}

return fmt.Errorf("lint error: %s", mergeProblems(filteredProblems))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return fmt.Errorf("lint error: %s", mergeProblems(filteredProblems))
return fmt.Errorf("lint errors: %s", mergeProblems(filteredProblems))

staging/src/k8s.io/component-base/metrics/testutil/promlint.go

// shouldIgnore returns true if metric in the exception list, otherwise returns false.
func shouldIgnore(metricName string) bool {
for i := range exceptionMetrics {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: why not convert the array of exception metrics to a map instead of implementing another iterator?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've thought about it. The exception list originally organized by components, some metrics with the same name may exist in more than one component.

It's worth to reconsider it. Maybe map[string]struct{}.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have collisions either way, no?

logicalhan
logicalhan approved these changes Jun 17, 2020
View reviewed changes
Copy link
Member

@logicalhan logicalhan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

staging/src/k8s.io/component-base/metrics/testutil/promlint.go

// shouldIgnore returns true if metric in the exception list, otherwise returns false.
func shouldIgnore(metricName string) bool {
for i := range exceptionMetrics {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have collisions either way, no?

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 17, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: logicalhan, RainbowMango

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dims
Copy link
Member

dims commented Jun 17, 2020

/hold Temporary hold to get prow/tide to get back on its feet. Feel free to remove hold in a few hours.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2020
@dims
Copy link
Member

dims commented Jun 17, 2020

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2020
@dims
Copy link
Member

dims commented Jun 18, 2020

/hold Temporary hold to get prow/tide to get back on its feet. Feel free to remove hold in a few hours.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 18, 2020
@dims
Copy link
Member

dims commented Jun 18, 2020

/test all

@dims
Copy link
Member

dims commented Jun 18, 2020

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 18, 2020
@dims
Copy link
Member

dims commented Jun 18, 2020

/retest

1 similar comment
@dims
Copy link
Member

dims commented Jun 18, 2020

/retest

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 49c5072 into kubernetes:master Jun 19, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jun 19, 2020
@JornShen JornShen mentioned this pull request Oct 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SergeyKanzhelev SergeyKanzhelev SergeyKanzhelev left review comments

@logicalhan logicalhan logicalhan approved these changes

@loburm loburm Awaiting requested review from loburm

@s-urbaniak s-urbaniak Awaiting requested review from s-urbaniak

Assignees

@logicalhan logicalhan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@RainbowMango @k8s-ci-robot @dims @fejta-bot @logicalhan @SergeyKanzhelev